Autogenerated HTML docs for v1.7.8-163-g9859a
diff --git a/git-config.html b/git-config.html index 8ace464..724d8bc 100644 --- a/git-config.html +++ b/git-config.html
@@ -2008,11 +2008,12 @@ <p> When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when - "git pull" is run. - <strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use - it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> - for details). + "git pull" is run. See "pull.rebase" for doing this in a non + branch-specific manner. </p> +<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use +it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> +for details).</p></div> </dd> <dt class="hdlist1"> browser.<tool>.cmd @@ -4083,6 +4084,20 @@ </p> </dd> <dt class="hdlist1"> +pull.rebase +</dt> +<dd> +<p> + When true, rebase branches on top of the fetched branch, instead + of merging the default branch from the default remote when "git + pull" is run. See "branch.<name>.rebase" for setting this on a + per-branch basis. +</p> +<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use +it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> +for details).</p></div> +</dd> +<dt class="hdlist1"> pull.octopus </dt> <dd>
